record_consumer and record_sale filter serialNo
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
+ 2
- 2
api/admin_views.py
@@ -576,7 +576,7 @@ def record_consumer(request): |
||
| 576 | 576 |
except AdministratorInfo.DoesNotExist: |
| 577 | 577 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 578 | 578 |
|
| 579 |
- logs = ConsumeInfoSubmitLogInfo.objects.filter(Q(status=True) & Q(ymd__gte=start_time) & Q(ymd__lte=end_time) & Q(test_user=False) & Q(model_name__contains=query) | (Q(phone__contains=query))).order_by('-created_at')
|
|
| 579 |
+ logs = ConsumeInfoSubmitLogInfo.objects.filter(Q(status=True) & Q(ymd__gte=start_time) & Q(ymd__lte=end_time) & Q(test_user=False) & Q(model_name__contains=query) | (Q(phone__contains=query) | Q(serialNo__contains=query))).order_by('-created_at')
|
|
| 580 | 580 |
|
| 581 | 581 |
count = logs.count() |
| 582 | 582 |
logs, left = pagination(logs, page, num) |
@@ -605,7 +605,7 @@ def record_sale(request): |
||
| 605 | 605 |
except AdministratorInfo.DoesNotExist: |
| 606 | 606 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 607 | 607 |
|
| 608 |
- logs = SaleclerkSubmitLogInfo.objects.filter(Q(status=True) & Q(ymd__gte=start_time) & Q(ymd__lte=end_time) & Q(test_user=False) & Q(test_sn=False) & (Q(model_name__contains=query) | Q(clerk_name__contains=query) | Q(distributor_name__contains=query))).order_by('-created_at')
|
|
| 608 |
+ logs = SaleclerkSubmitLogInfo.objects.filter(Q(status=True) & Q(ymd__gte=start_time) & Q(ymd__lte=end_time) & Q(test_user=False) & Q(test_sn=False) & (Q(model_name__contains=query) | Q(clerk_name__contains=query) | Q(distributor_name__contains=query)| Q(code__contains=query))).order_by('-created_at')
|
|
| 609 | 609 |
|
| 610 | 610 |
count = logs.count() |
| 611 | 611 |
logs, left = pagination(logs, page, num) |